Skip to content

Conversation

@nalind
Copy link
Member

@nalind nalind commented Jan 3, 2017

Revendor "golang.org/x/sys" to pick up "golang.org/x/sys/unix", which we now use instead of syscall. Handle Linux and BSD using different names for the mtime part of a Stat_t. Add "darwin/amd64" to the list of OS/arch combinations that we preserve dependencies for when we're stripping out unused things in hack/vendor.sh.

@runcom
Copy link
Member

runcom commented Jan 4, 2017

This should be fixing https://travis-ci.org/containers/image/builds/188613572#L344, thx

Handle Linux and BSD using different names for the mtime part of a
Stat_t.  Add darwin/amd64 to the list of cross-build arches we try
to build during 'make cross'.

Signed-off-by: Nalin Dahyabhai <[email protected]>
@nalind
Copy link
Member Author

nalind commented Mar 6, 2017

Rebased on top of #24; this should fix containers/skopeo#310.

@rhatdan
Copy link
Member

rhatdan commented Apr 19, 2017

LGTM

@nalind nalind merged commit dbcaa73 into containers:master Apr 19, 2017
mtrmac added a commit to mtrmac/skopeo that referenced this pull request Apr 28, 2017
containers/storage got new dependencies, so we will need to re-vendor
eventually anyway, and having this separate from other major work is
cleaner.

But the primary goal of this commit is to see whether it makes skopeo
buildable on OS X.
mtrmac added a commit to mtrmac/skopeo that referenced this pull request Apr 29, 2017
containers/storage got new dependencies, so we will need to re-vendor
eventually anyway, and having this separate from other major work is
cleaner.

But the primary goal of this commit is to see whether it makes skopeo
buildable on OS X.
mtrmac added a commit to mtrmac/skopeo that referenced this pull request Apr 29, 2017
containers/storage got new dependencies, so we will need to re-vendor
eventually anyway, and having this separate from other major work is
cleaner.

But the primary goal of this commit is to see whether it makes skopeo
buildable on OS X.
mtrmac added a commit to mtrmac/skopeo that referenced this pull request May 9, 2017
containers/storage got new dependencies, so we will need to re-vendor
eventually anyway, and having this separate from other major work is
cleaner.

But the primary goal of this commit is to see whether it makes skopeo
buildable on OS X.
mtrmac added a commit to mtrmac/skopeo that referenced this pull request May 10, 2017
containers/storage got new dependencies, so we will need to re-vendor
eventually anyway, and having this separate from other major work is
cleaner.

But the primary goal of this commit is to see whether it makes skopeo
buildable on OS X.
mtrmac added a commit to mtrmac/skopeo that referenced this pull request May 11, 2017
containers/storage got new dependencies, so we will need to re-vendor
eventually anyway, and having this separate from other major work is
cleaner.

But the primary goal of this commit is to see whether it makes skopeo
buildable on OS X.
mtrmac added a commit to containers/skopeo that referenced this pull request May 12, 2017
@nalind nalind deleted the vendorsys branch June 8, 2017 19:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants